bitkeeper revision 1.1603 (429c25daAxv8CzKG49dW0khs2wyBew)

xc_ptrace_core.c, xc_ptrace.c:
  SLES9 has a problem with it's <asm/elf.h> and other headers associated
  with it. Since we are only using one thing from this (that we really
  don't need) we can just stop including it.
http://bugzilla.xensource.com/cgi-bin/bugzilla/show_bug.cgi?id=34
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/tools/libxc/xc_ptrace.c b/tools/libxc/xc_ptrace.c
index f465f1e0856b4dce22ff6b455d7be5999ba711ee..1db45a7bbb5bfb18b910154a0cff10d9542f273c 100644 (file)
--- a/tools/libxc/xc_ptrace.c
+++ b/tools/libxc/xc_ptrace.c
@@ -1,7 +1,6 @@
 #include <sys/ptrace.h>
 #include <sys/wait.h>
 #include "xc_private.h"
-#include <asm/elf.h>
 #include <time.h>
 
 
@@ -301,7 +300,7 @@ xc_ptrace(enum __ptrace_request request, u32 domid, long eaddr, long edata)
 
        if (request == PTRACE_GETREGS) {
                SET_PT_REGS(pt, ctxt[cpu].user_regs); 
-               memcpy(data, &pt, sizeof(elf_gregset_t));
+               memcpy(data, &pt, sizeof(struct gdb_regs));
        } else if (request == PTRACE_GETFPREGS)
            memcpy(data, &ctxt[cpu].fpu_ctxt, sizeof(ctxt[cpu].fpu_ctxt));
        else /*if (request == PTRACE_GETFPXREGS)*/

diff --git a/tools/libxc/xc_ptrace_core.c b/tools/libxc/xc_ptrace_core.c
index 7a5eeea21d58054ef7da08e5071af0a853a1c126..ec7a6980c3b161e9416bffde46fb94f24d3a1f90 100644 (file)
--- a/tools/libxc/xc_ptrace_core.c
+++ b/tools/libxc/xc_ptrace_core.c
@@ -1,7 +1,6 @@
 #include <sys/ptrace.h>
 #include <sys/wait.h>
 #include "xc_private.h"
-#include <asm/elf.h>
 #include <time.h>
 
 
@@ -258,7 +257,7 @@ xc_ptrace_core(enum __ptrace_request request, u32 domfd, long eaddr, long edata)
     case PTRACE_GETFPXREGS:
        if (request == PTRACE_GETREGS) {
                SET_PT_REGS(pt, ctxt[cpu].user_regs); 
-               memcpy(data, &pt, sizeof(elf_gregset_t));
+               memcpy(data, &pt, sizeof(struct gdb_regs));
        } else if (request == PTRACE_GETFPREGS)
            memcpy(data, &ctxt[cpu].fpu_ctxt, sizeof(ctxt[cpu].fpu_ctxt));
        else /*if (request == PTRACE_GETFPXREGS)*/